Add tree-sitter-htmldjango #3249
Conversation
|
Ok, I'll checkout and update other monokai pro theme as soon as possible |
| name = "htmldjango" | ||
| scope = "source.htmldjango" | ||
| injection-regex = "htmldjango" | ||
| file-types = ["html"] |
There was a problem hiding this comment.
It looks like this entry beats regular html for .html files. We have another conflict like this between verilog and V and I think the only way around it for now is to have one of them where you have to override it in a .helix/languages.toml or ~/.config/helix/languages.toml:
[[language]]
name = "html"
file-types = []
[[language]]
name = "htmldjango"
file-types = ["html"]Since HTML is more popular than django I think we should disable this language by default
| file-types = ["html"] | |
| file-types = [] |
There was a problem hiding this comment.
Yes, it beats html, but doesn't it only apply if say the root file manage.py is found?
There was a problem hiding this comment.
Oh wait, it doesn't. Maybe we should apply it conditionally based on the roots? I will take some time before I get to work on this later.
There was a problem hiding this comment.
I was also under the impression that file-types would only be superceded if manage.py was found based on these settings, a file I've never heard of or seen people using until I did some web searching based on this PR's options. I'll need to re-read those options.
There was a problem hiding this comment.
This should be fixed now, but I am still a bit not quite happy with the result that the ordering is a bit messy (it will take the first glob that matches the path and have the root within the path). Some parts of it were taken from #2455, but I haven't updated the docs yet.
There was a problem hiding this comment.
This should be fixed now, but I am still a bit not quite happy with the result that the ordering is a bit messy (it will take the first glob that matches the path and have the root within the path). Some parts of it was taken from #2455, but I haven't updated the docs yet.
| (paired_statement) @indent | ||
| (end_paired_statement) @indent_end | ||
| (branch_statement) @branch |
There was a problem hiding this comment.
These look like they're in nvim style (we don't use branch or indent_end iirc). Could you adjust them to the helix ones? https://docs.helix-editor.com/guides/indent.html
I'm not caught up yet on the indentation mechanism so actually I'm not too sure how to these should look myself 😅
The default indent mechanism (removing this file) might work well. It seems to work pretty well for HTML for me
There was a problem hiding this comment.
I changed it but didn't go and test it out.
Default to django if it matches file-types of templates/**.html and have root of manage.py, otherwise defaults to html.
| (paired_statement) @indent | ||
| (end_paired_statement) @outdent |
There was a problem hiding this comment.
Thinking about this again, not sure if we want this since vim does not indent django paired statements.
If multiple languages have the same extension or file name, prioritize the one that have a matched root. Example with django, 1. html extension matched, but can use both language html and htmldjango 2. html have no roots and django have manage.py roots 3. if djangohtml roots are found in root search path, prefer djangohtml 4. otherwise defaults to first match
| } | ||
| } | ||
|
|
||
| pub fn find_root_impl(root: Option<&str>, root_markers: &[String]) -> Vec<PathBuf> { |
There was a problem hiding this comment.
I don't quite know why are we not using Path here, but I don't feel like changing this here.
|
@the-mikedavis What do you think about the glob changes? If you are okay then I will fix the conflicts. |
|
I like the new version where languages can share file-types 👍. I think that will help with v and verilog which share a file-type too. It could probably use a line in the documentation somewhere (maybe |
|
Hi all, any update on this? I'm currently bodging my way through this by copying the .scm files, but it isn't working well. Happy to test with my codebase if that's needed. |
|
closing this one as stale, thank you for contributing! |
Great thanks to @interdependence for building tree-sitter-django.
I didn't check why the variables doesn't seem to work but other than that it is already good enough for now.
cc @WindSoilder I added
tagandkeyword.functionto monokai spectrum since I was using it.